From 6dcd124356d7d72d864562487686683c7c826f94 Mon Sep 17 00:00:00 2001 From: Reedy Date: Fri, 18 Mar 2016 14:02:26 +0000 Subject: [PATCH] Use imported namespaces, don't fully qualify Remove unused import in CachedBagOStuff Change-Id: I60ca8acc0e34384ce6ad6cde1cfb3a5dc8021e5f --- includes/libs/objectcache/CachedBagOStuff.php | 2 -- includes/specials/SpecialUserlogin.php | 4 ++-- includes/user/LoggedOutEditToken.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/includes/libs/objectcache/CachedBagOStuff.php b/includes/libs/objectcache/CachedBagOStuff.php index 3d5d383e42..60ec9222f0 100644 --- a/includes/libs/objectcache/CachedBagOStuff.php +++ b/includes/libs/objectcache/CachedBagOStuff.php @@ -21,8 +21,6 @@ * @ingroup Cache */ -use Psr\Log\LoggerInterface; - /** * Wrapper around a BagOStuff that caches data in memory * diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 8d45468092..1ed8407019 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -275,7 +275,7 @@ class LoginForm extends SpecialPage { */ public function execute( $subPage ) { // Make sure session is persisted - $session = MediaWiki\Session\SessionManager::getGlobalSession(); + $session = SessionManager::getGlobalSession(); $session->persist(); $this->load(); @@ -1716,7 +1716,7 @@ class LoginForm extends SpecialPage { $wgCookieSecure = false; } - MediaWiki\Session\SessionManager::getGlobalSession()->resetId(); + SessionManager::getGlobalSession()->resetId(); } /** diff --git a/includes/user/LoggedOutEditToken.php b/includes/user/LoggedOutEditToken.php index 14548f409b..7a70773f83 100644 --- a/includes/user/LoggedOutEditToken.php +++ b/includes/user/LoggedOutEditToken.php @@ -32,7 +32,7 @@ use MediaWiki\Session\Token; * * @since 1.27 */ -class LoggedOutEditToken extends MediaWiki\Session\Token { +class LoggedOutEditToken extends Token { public function __construct() { parent::__construct( '', '', false ); } -- 2.20.1